From d640a290f281704d8375ef388da53dbca9c1d248 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Tue, 4 May 2010 12:29:05 +0100 Subject: [PATCH] vmx, tboot: Check the correct in/outside-SMX flag when init'ing VMX. Signed-off-by: Shane Wang Signed-off-by: Keir Fraser --- xen/arch/x86/hvm/vmx/vmcs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 171b595eab..c3bfaa9d25 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -376,8 +376,9 @@ int vmx_cpu_up(void) bios_locked = !!(eax & IA32_FEATURE_CONTROL_MSR_LOCK); if ( bios_locked ) { - if ( !(eax & (IA32_FEATURE_CONTROL_MSR_ENABLE_VMXON_OUTSIDE_SMX | - IA32_FEATURE_CONTROL_MSR_ENABLE_VMXON_INSIDE_SMX)) ) + if ( !(eax & (tboot_in_measured_env() + ? IA32_FEATURE_CONTROL_MSR_ENABLE_VMXON_INSIDE_SMX + : IA32_FEATURE_CONTROL_MSR_ENABLE_VMXON_OUTSIDE_SMX)) ) { printk("CPU%d: VMX disabled by BIOS.\n", cpu); return 0; -- 2.30.2